TreeViewCol: Don’t try to disconnect null treeview

https://bugzilla.gnome.org/show_bug.cgi?id=788614

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 7076153f5b392b48fee522632dfd49b28eb30c49..9dd368ab8ee0f467210af3f21c99eb3638426dc8 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1331,10 +1331,11 @@ _gtk_tree_view_column_unset_tree_view (GtkTreeViewColumn *column)
 {
   GtkTreeViewColumnPrivate *priv = column->priv;
 
-  if (priv->tree_view)
-    {
-      gtk_container_remove (GTK_CONTAINER (priv->tree_view), priv->button);
-    }
+  if (priv->tree_view == NULL)
+    return;
+
+  gtk_container_remove (GTK_CONTAINER (priv->tree_view), priv->button);
+
   if (priv->property_changed_signal)
     {
       g_signal_handler_disconnect (priv->tree_view, priv->property_changed_signal);
@@ -1344,7 +1345,7 @@ _gtk_tree_view_column_unset_tree_view (GtkTreeViewColumn *column)
   if (priv->sort_column_changed_signal)
     {
       g_signal_handler_disconnect (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree_view)),
-                                  priv->sort_column_changed_signal);
+                                   priv->sort_column_changed_signal);
       priv->sort_column_changed_signal = 0;
     }